Merge "Fix implicit fallthrough warnings."
am: 012692be3f

Change-Id: I37a244c2e850d1247010d92b9e91b9c34df159f1