Merge change 7804

* changes:
  Fixing probable build breakage.