Merge pull request #17083 from BruceForstall/RemoveArmDeadCode