am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':