Merge change I8e7241a9

* changes:
  Make apicheck happy.