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

Change-Id: I3be15c045c79092f8412a5134523756128e6dc03