Strategic fix for infinite loop
am: b3aa618706

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