Reconcile with jb-mr2-release - do not merge

Change-Id: I57ada5cdfa6a6ecb82014096f09dce224859ba1c