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

Change-Id: Ib08f5c3c72f9d6eee571e7f9dff130abadffbbec