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

Change-Id: I15433e982bbaa80391db117f5f1abd40469c70a6