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

Change-Id: I5b78989adfb6298877bf213ef46ea714bc7fd521