Reconcile with jb-mr0-release am: 29b858a5d6
am: 24810962f8

* commit '24810962f8e4ebdf394264802d6502c8ff287548':