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

Change-Id: I46fd654e5e5a4088c616ed35b901eb1e8ed4d963