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

Change-Id: I3672112a4fde9cf606de54d71b3a1c1047c2b553