merge from open-source master

Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226