Merge "Remove dial_string_replace configs"
am: c95c2344b5

Change-Id: I74902917220aaa287472867e69cabdc488f517eb