am c1d492ca: merge from open-source master

Merge commit 'c1d492ca536a3acf4156d06ce01c932b8b762cb9'

* commit 'c1d492ca536a3acf4156d06ce01c932b8b762cb9':