Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d
am: 29c7538644

* commit '29c75386448128b0ba69f62eb01cc05bfe9d051d':