Merge "Remove dial_string_replace configs" am: c95c2344b5
am: 90ca3ff5e6

Change-Id: I8f561d0d872d99cf84b3a14e3c025df87169ca88