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

Change-Id: Ie7ab7739935e7d17b32028189469eb8eb4764c8b