Merge "Update notification settings OWNERS"