am cc86adcb: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'cc86adcb3d78a64aed159facb1ad74d0e90310d3':