[ros-diffs] [jimtabor] 68921: - Remove test code from nonclient.