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

Change-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac