Merge "Merge "Remove obsolete core/res owners" am: c117fd9826 am: 13cf655c86 am: 4c2b2b3ad6"