[automerger skipped] Fix accidental implicit fallthroughs am: e43fe9ddf2 am: 876dd34376 am: 8dbb6dee8f -s ours am: c7e702e3f9 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 bfcf9140fe is in history

Change-Id: I41cb2052d465610566ea5622a836a64cbb27d0c8