[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 46049f5fec  -s ours am: fb5b05d2ff  -s ours
am: b7ce376383  -s ours

Change-Id: Ic6dda848431242e4238dd97cd42512d2a18d3741