am 159e1a9a: Merge change 8883 into donut

Merge commit '159e1a9a13ccfa4d99941e21068994366e2bbc7b'

* commit '159e1a9a13ccfa4d99941e21068994366e2bbc7b':
  fix [1973755] Surface.SURACE_FROZEN spelled SURACE_FROZEN