am 3c73fdaa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3c73fdaad106c2bd5e9d9349aae13f07ec40a547':