Merge "Fix BackgroundDexOptService scheduled job"