merge from open-source master

Change-Id: Iedee6a43e23821175148324bc2502a33112e2d59