pesky little strings

Change-Id: I170289e330c711df8138a988cd843a1725f5ba0c