merge from open-source master

Change-Id: If77618a329fc7b497c44c2585e644bc50e7e1406