Intermediate checkin for profilesync as we try to share between server
and client.