MIFOSX-1723 Extend client service to handle images

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