Remove String16 from client-facing code. am: f7a651d49c
am: f439502cb7

Change-Id: I964d6b67f7e6afd59909d3171c7d97f7cab4ed6f