Merge "Harder failures for lazy service clients." am: e5c824b24c

Change-Id: I988eec655f6505b248d8878278f9f1068580c81e