merge from open-source master

Change-Id: I53bb11e377bf04e9a0a75ce6bb0c1c4afe3faaeb