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

Change-Id: Ica83f7c883f5c91db0a83fcedec223571f91c2f5