merge from open-source master

Change-Id: I0902959c7703bd3a1c41abfc6a8788b89d0aa977