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