Reconcile with jb-mr2-release - do not merge

Change-Id: Iac2c14a32628f494cbede0dd5cafb01998318c33