Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I485e19b1268b22f39d0f1e5bc634cb329b48852b