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

Change-Id: Ie11bc98347697a21a3cb79d5da8138b8e7bebb32