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