Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376

Change-Id: I38046073df4d71624597a997367fb82fc5cecbf0