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

Change-Id: I588ae4c43c605d0a5d9b6a61e90f868b2fd41ea7