MIFOSX-1722 Extend client service to handle identifiers

This was done as part of:
https://www.google-melange.com/gci/task/view/google/gci2014/5841134869807104