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

Change-Id: Ic8d9ce1145f5905986ee9b567f020a8cc7a58058