Add missing handler for String's

Change-Id: I1ed1b31a1a7b7edfe305bd2007538a0fe724d675