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

Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24