Reconcile with jb-mr1-release - do not merge

Change-Id: I1ad6aff00b1ec87e7db7001b6f5d271fd122723c