Merge change 20788

* changes:
  make private inner classes static