Reconcile with jb-mr1-release - do not merge

Change-Id: I76401e4d503b987805ad009441310290bef71483