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

Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3