Reconcile with jb-mr1-release - do not merge

Change-Id: Ia0c83f8eaad8974240651bfa206f0212eb72983d