merge from open-source master

Change-Id: Ib7fc9c6f79f9b13e2175da137005d8968ea85eaf