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

Change-Id: I355e91c06f0958f1baec5923324dcbcdf408d3f2