Reconcile with jb-mr2-release - do not merge

Change-Id: I1442a44754b64c868210578faf00006c5aaa6b58