merge from open-source master

Change-Id: Iaf5b3ca005d424cb8bf14bf38e15fede008fcb47