Merge "Fix accidental implicit fallthroughs"
am: 5a651961b0

Change-Id: Ib11ad4e2377383216799f3b5fd818a24f45e97de