Merge "Replace test TODOs with ACTION."