merge from open-source master

Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8