Merge "Add missing break in switch statement" into jb-mr1-dev