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

Change-Id: Ic281cecdd11964b0e7849fb477a5f470958ada79