Reconcile with jb-mr2-release - do not merge

Change-Id: Icffab869a16395b5985c14995d49333302f0bc0a