merge from open-source master

Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9