This first CL simply adds the new string before string freeze. Change-Id: I7d5ed7a8467179668c123380cc516a80099d4993