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

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