merge from open-source master

Change-Id: If9a300a80228f30166ed42853ae13236aaa2eee5