[automerger skipped] Fix accidental implicit fallthroughs am: fbeb4fc139 am: 85eac001da am: 89462bd0e6 -s ours am: 0d411bddad -s ours am: 49e01145d5 -s ours am: 3235fb8377 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 540824e658 is in history

Change-Id: I4d37c610262fc6dbcd614eff0436c74becec497e