merge from open-source master

Change-Id: Ia81df7e22e563b01091778043bba65dee1699e83