am 6d547933: merge from open-source master

Merge commit '6d547933b8aa3a811499708bc8a4fea551599359'

* commit '6d547933b8aa3a811499708bc8a4fea551599359':