Reconcile with jb-mr2-release - do not merge

Change-Id: I2a7a7aed31eaf87aac6359a320d4b8c3f3d6b034