Merge change 20622

* changes:
  Remove unused member mHeaderValueIndex