Reconcile with jb-mr2-release - do not merge

Change-Id: Iab5d64e8c12e454fe171f7e61384427e62bde6a5