Merge "Don't remove existing EAP configurations" into nyc-dev