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

Change-Id: I470d1b8e5f8bc1766187486d2ea8950ed45431c6