Merge "Invalidate the cache for APK-in-APEX" into rvc-dev