am 0bb0597a: Merge change 7556 into donut

Merge commit '0bb0597a4b5b0825f710f1bd63efb7069cecd918'

* commit '0bb0597a4b5b0825f710f1bd63efb7069cecd918':
  Temporarily suppress ServiceTest.