am c31ebf5f: merge from open-source master

Merge commit 'c31ebf5ff3cbeb992e0cbe61205f424040f1028b'

* commit 'c31ebf5ff3cbeb992e0cbe61205f424040f1028b':