Merge "Match CF ARM and regular IME test name" into udc-dev