Refactor Client Entity Models

This BP describes a refactor to the Entities in the client
for a more consistent api.

Change-Id: I3830cdfa1ec99957b73afe4b9298a5a6e59d17d5
Merge "Refactor Client Entity Models"