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

Change-Id: Ifecec1701216bc5ce4d68a7d89d55241d716c311