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

Change-Id: I8819d77d2cd0f33d9f4e5553a5b2d4639fe4ec47