Use Encoder/Decoder types from client_model

Change-Id: I30e2f1aaa87c60fd83702d1b51be4a07ab3344fc