Merge \\"Changes the order of operations for E911 Calls\\" into nyc-mr1-dev am: ec6f78f6d8
am: ca902edf57

Change-Id: Ic7ba8738256e63161ed58fe4d21818bf4cec22e5