Reconcile with jb-mr2-release - do not merge

Change-Id: I19ae00132e4e0709be4b71735de8f1ada12962a4