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

Change-Id: I5497444c80633999820bf0380a50194b74a7ba45