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

Change-Id: I637aed4560bb83e2934faaabcf4a867dec072441