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

Change-Id: Ib9d689c7e8ac4eca802f694d6dbd902653eb84f1