Merge change 7147

* changes:
  this header file is not needed anymore