merge from open-source master

Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d