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

* commit 'fd04a7abe7722be94c84e24dc71a2b695e3ddafc':