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

Change-Id: Ia5f2a5e52cbf527040a69a61c21f7a129e266ede