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

Change-Id: I669eab07bfe34cf92007b7a2ffefbbdeec4d5083