merge from open-source master

Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95