Moving contact starring to the service.

Also, cleaning up some internal API.

Change-Id: I5bd2c5e24413f4e9ea538757ab05c85885f8533e
5 files changed