Strategic fix for infinite loop am: 33893d68d4
am: 874fbe4b27

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