Merge "Fix BackgroundDexOptServiceIntegrationTests"