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

Change-Id: I0ae4d2e710b5380f13fea6f62352842679ed248b