Merge "Don't create cache when doing Apex PreRebootVerification" into rvc-dev am: d2bd6bae am: f5e21bc3 Change-Id: I5df1103ba2c1dadb663a865ec44439d8d5d31827