Merge "Don't create cache when doing Apex PreRebootVerification" into rvc-dev