Reconcile with jb-mr1-release - do not merge

Change-Id: I8313a3f0bfe67f7d4c044d95edd9dcdc5672a37a