Merge "Adding Natanieljr@ to flicker owners"