merge from open-source master

Change-Id: Ic4cfffc3c8d465224b062cef7bcfe5827441057c