Merge "API Council Feedback - Override EmergencyNumberDB File API"