Reconcile with jb-mr1-release - do not merge

Change-Id: I0c96fcfe474c0536ddfaaea7705b4956df0e0f43