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

Change-Id: If4968b73ad8cb2b7ddf8333507a803378b8e3d53