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

Change-Id: I3f64a6e5e04798fec2b056c5b5ce481a440741f1