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

Change-Id: Id732ebdaefa983dc38d2a27a0f04317888b3a3f9