Merge change 7556 into donut

* changes:
  Temporarily suppress ServiceTest.