merge from open-source master

Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b