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

Change-Id: I1d8a270476865fe2631bb97380ff4bf55709b706