Reconcile with jb-mr1-release - do not merge

Change-Id: I81df464c8faae1c41e8e1b8f0da8337e64c3fd09