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

* commit '3fdb2ab38c871904a87e368922de3fa94faf45d3':