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

Change-Id: I8d3a746434bd551aff34593897cd85c7b53ec25f