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

Change-Id: Ifdd0372544e379cb276a049d250ae6af7fd80e37