[automerger skipped] Merge "Fix accidental implicit fallthroughs" into oc-mr1-dev am: f5d56edc27 -s ours am: 57badc4ae2 -s ours am: 5c33d5b916 -s ours am: 49fff87ce0 -s ours
am skip reason: Change-Id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA-1 fbeb4fc139 is in history

Change-Id: I913fa667e484f943270217c34d50f90fe64ce9a6