Merge "[Script] Fixed assorted string usage issues"
am: ee165459bb

Change-Id: I8d3b63ec6737f4d5f3fcb33d0ec882c373677c72