Reconcile with jb-mr1-release - do not merge

Change-Id: I462183714b491c5e8f32d29f353b11cb50764cf3