Fix client for further patching

Change-Id: Ibf0cd08049c54921af79236e036d58f1b8300ac6
Merge "Fix client for further patching"