am 0637db6c: merge from open-source master

Merge commit '0637db6c8d91df04cf51f114774f377215718ecd'

* commit '0637db6c8d91df04cf51f114774f377215718ecd':