merge from open-source master

Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e