Merge "Changes the order of operations for E911 Calls" into nyc-mr1-dev