Merge change 8883 into donut

* changes:
  fix [1973755] Surface.SURACE_FROZEN spelled SURACE_FROZEN