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

Change-Id: I4b8a0a64c797af5353e10c82170baace00730207