Fix issues from merge

Update comments and missing break statement.

Test: no behavior change
Change-Id: I52e836bee8241e781978dac2b024d8c89d7f9be8
3 files changed