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

Change-Id: I99bb06eb9da339f1a6f7c7c39603884f14bfdff2