Reconcile with jb-mr2-release - do not merge

Change-Id: Ia58e3622b8f48598feeae9a089adb7af125e8013