Merge "Remove obsolete core/res owners"