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

Change-Id: Ibe22e1f71d4641aeb6a31e0609d2414e4333ac3a