Merge "Removing "_short" suffix from arm transform file names."