am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'ebed8a53cca62d19d13ec2381c7e0f4acf1ba302':