merge from open-source master

Change-Id: I0bbbd7f9b6f84e1682793e239997838c24d17244