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

Change-Id: Ie79ee1155644285ca2fb01c6e62b14ead9f4fa9e