Reconcile with jb-mr2-release - do not merge

Change-Id: Ic31e144dc752e8c259b9589e9f0804b2bf8d05b2