Merge change 26920

* changes:
  Fix gcc complaint.