Merge "Fix implicit-fallthrough warnings."
am: c1ddd1b231

Change-Id: I3ba8db4deebbb7b4bcd94d2d8f756b503b6d4d0f