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

Change-Id: I9499ee080c842e363f7aa78057f714dd3e32d43d