am 2fc16d46: merge from open-source master Merge commit '2fc16d46cef711a6e8e1cd888444a079e14c2cde' * commit '2fc16d46cef711a6e8e1cd888444a079e14c2cde':