Merge "Bug 518287 - Generate client-only adaptors"