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

Change-Id: I4327ff6561f3bb3e8c55c6daeea34e3823538d25