Reconcile with jb-mr2-release - do not merge

Change-Id: I60878364265a0889aaa0d1f32e709b9a4e632636