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

Change-Id: I728b304c185d7f0406b6d45334c10263bd38d769