[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 593ede93f0  -s ours am: 7182d9c970  -s ours
am: 7d1c9d000a  -s ours

Change-Id: I76222bc76e63cef871854c4e4a629849417dfe9f