am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '42b4c5083b168c6780b95e5c60b49655b049d56f':