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

Change-Id: Idcf1a5e4acf53a40deeb6304d83a734722c7aff4