Merge "Don't be clever with strings" into pi-dev am: b399db7b2a
am: 82bc3bdaa2

Change-Id: I1c9f4910b5d7320ecb3c9a3f801c17e4e8dc0d04