Merge "Adding strings to support warning about emergency calls." into oc-mr1-dev