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

Change-Id: I10aa690a24bdda6d980ae5ab4f90ab5fa02ba165