Fix implicit fallthrough warnings. am: 40b77ef6b5
am: 80c5b8fc76

Change-Id: I52755c761e883d3c3f30d81bda5002cb9be29bcf