merge from open-source master

Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0