Merge "Fix implicit fallthrough warnings." am: fe9d6ef9f3 am: 0085e651da
am: 7db171bf8d

Change-Id: I0b3eb93a95489b6c2446cae6e3fe757f1910caf8