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

Change-Id: I52be076166579c8292066f388720b63054e8d7ea