[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: 0a298ae489 -s ours
am: 95b5c69a90 -s ours
am skip reason: change_id I818e18a995760f17b85b4c72ee577e531fa2a601 with SHA1 e43fe9ddf2 is in history

Change-Id: I1de278de887da4179015a6e5eb2f71c1d6f90a22