Merge "Make TEST_INPUT_METHOD @TestAPI"