Merge "Remove 'break's to make sure we see all options."
am: 237377b48f

Change-Id: Ia275df62f6343e49857a6624ed043c10124a3c47