merge from open-source master

Change-Id: I9bfbf5c98f00a0ec6abb2ad389b5f4d138458441