am ff82263e: Fix String Change baseline compiler errors.

* commit 'ff82263e2b96ad099c56c19b91c2286baaf82fa7':
  Fix String Change baseline compiler errors.