Merge "Fix implicit fallthrough warnings."
am: 50c5673394

Change-Id: Icde910df28e22eb4e13e118fba1bb63cc0f2d425