merge from open-source master

Change-Id: I9381e982495bddb4ddba12bdc46f8c4becddd6bf