[automerger skipped] Fix accidental implicit fallthroughs am: bfcf9140fe -s ours am: 55ff29a3de -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 377856d1be is in history

Change-Id: I08c4ca369f6b0c51aab27ac7145e75aed954caef