Merge "API Council Feedback - Override EmergencyNumberDB File API" into rvc-dev