[automerger skipped] Merge "Fix implicit-fallthrough warnings. DO NOT MERGE." am: 5106743a12  -s ours am: 44f0786670  -s ours
am: d08498c0f0  -s ours

Change-Id: I74352a9cb7b6fcbefc5b1e579cc28ad9a3079a99