Merge change 8987

* changes:
  Fix firestone build