Reconcile with jb-mr1-release - do not merge

Change-Id: Ifba742d6ead562601f4e93d1d526b5efe396066f