Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev