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

Change-Id: I13906741bc3d455cf71c9f5bff6f79a437f42123