merge from open-source master

Change-Id: I3af7e5270229f9fc6c57c9449052025af2a9bdca