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

Change-Id: I349c5d3593e2c69d5d65a96035e54b0e8b88c419