Merge change 20750

* changes:
  remove unused locals