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

Change-Id: Ibadcd642e060d8b828b13f7c748f0dfddf751906