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

Change-Id: Idd543bd5d8f7f79b194de4297d2bfe8cb573f454