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

Change-Id: If89cb33a85e3457bff663b54d6dc16b05f180294