Reconcile with jb-mr1-release - do not merge

Change-Id: Ia5d484b16bf45e3a8481bf5c81864474749f964e