Merge "Update OWNERS for the content and sync subsystem"