Merge "Do not change resources table for overriding apps" into mainline-prod