tree 44c3eb4be5abedd13f67f311ed47ea3d147de312
parent eafb4b87de62f6c303c56c40009ea6400a643c0f
author Jordan Liu <jminjie@google.com> 1531507182 -0700
committer Jordan Liu <jminjie@google.com> 1531507732 -0700

Fix issues from merge

Update comments and missing break statement.

Test: no behavior change
Change-Id: I52e836bee8241e781978dac2b024d8c89d7f9be8