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

* commit 'f5672feccfc4b3be0ddecc092b949710dec47bba':