Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3455d526f17f7dc7a6e00f9ea1e2612a5c541668