Merge "Add missing break statement to fix cts test"