Merge "NFC: Fix implicit fallthrough by adding a break (and refactoring logic)." am: 74591624 am: 5ef08d55 am: 0032e990 Change-Id: Ic1def4654a65c1cf7c1cac732b3673bd165f2bf5
mentioned in commit 2cbae19e