Merge "Guard retrievePreRebootSecurityLogs with config flag" into nyc-dev