merge from open-source master

Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab