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

Change-Id: Idb3ece6de72b8e4293e69dfb6de2407b3be02cdd