merge from open-source master

Change-Id: I6e4280a7f664c84bdd5205db642ed0ae63bc5e3b