am 001eb417: Merge from open-source master

Merge commit '001eb417d9cc6abc7478fc3e0528b74f8289a758'

* commit '001eb417d9cc6abc7478fc3e0528b74f8289a758':