merge from open-source master

Change-Id: Iadd4a92f0384fdb8afa015613957b7d78b3d100a