am 3115999c: (-s ours) Reconcile with jb-mr1-factory-release - do not merge

* commit '3115999c7c611f0466207edd727209fe41f045ce':