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

Change-Id: I0a56a7cd77b8d52e699455b6bd01b884bcc32bc4