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

Change-Id: I5b0a5ed28f84d9e080f30feeec05975512a8b8f7