Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: Ib57ae3808ebba85d86263457c2a92e899019d80a