Merge "Harder failures for lazy service clients." am: 07b8e06531

Change-Id: I60a481b5b6e8c43a0e82b0a2fccfde905d238295