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

Change-Id: I10fdd68099d63ec360757e5ee7637a84e9892e76