Merge "Sort symbol names when creating a new script." am: 4592d293c8
am: fac10cab06

Change-Id: Idf7b122a60471d3494a9aceccc206d6fde246ef7