Remove String16 from client-facing code.
am: f7a651d49c

Change-Id: I4b8c82bc564167e67be94f4ee66252675b2a5bb0