merge from open-source master

Change-Id: Ice679e12b8393621b21a8dafe640dd880a09d35e