Merge "Revert "Fix bug which displays "conf-factory.." string in dialer app."" into nyc-mr1-dev