merge from open-source master

Change-Id: Ie2616d4bbc9f1f545accbf043176b698e2e7dc3f