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