merge from open-source master

Change-Id: I8bad78233bd0e6d44e717feeafbf09127f4cbfee