Strategic fix for infinite loop
am: a9d0a4a5f6

Change-Id: Ib2e7b639986b6f299baafd818494f5bd3f2ffcca
tree: 7422ac053c76e59d66d3ee0239ad5d2c235b325c
  1. service-t/
  2. tests/