Merge change 20761

* changes:
  make finals static, remove unused local