Merge "Add configurable emergency call number support" into nyc-mr1-dev