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

Change-Id: Ib9988ab46fa193d7b67d07fbaf5ac4d58a0408f8