Merge commit \'1edd8b6105c0ed292fc33e15d1f5cdd2a81ed154\' into HEAD
am: 5798335005

* commit '57983350058aedbca1a66c51ae8440faea32310c':