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

Change-Id: Ib2c2ee9efe4216329231a2bf4abc608ea662bc85