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

Change-Id: If32238e55616a79f2e91182672c71f9d704fb2a1