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

Change-Id: I3f20206be34b065992e47210bf5a10b3c4bfcfb9