Merge "NFC: Fix implicit fallthrough warning."
am: 30fc8829ed

Change-Id: I1837ef1eee710248fde3e7d7c7d9a5101de9a69a