Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am: a7d4ead252 am: 38c77c1443
am: 80fa64f36f

* commit '80fa64f36f37daefd4515dc3468da1ca3ed71014':