Reconcile with jb-mr1-release - do not merge

Change-Id: I759cbab32b17e45dd3d3e97ccf5e6039cfdff691