merge from open-source master

Change-Id: I414c9479f4f913c777ef18b7ff27e410f49d35b9