am 512d09d3: (-s ours) am 9bffd1e9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '512d09d3ecfafc0d52055612a3536e8b20a7df93':