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

Change-Id: Ia430ad311d9a3c38499ccfd480283e992dc7214d