am 414aadc7: am 3bf2fcf9: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '414aadc79de68713e0a80a033c03b651615176f8':