Merge "Fix implicit-fallthrough warning."
am: 30d20bf9a3

Change-Id: Ie1c9d8655bf800b3e9484057d21fb111e82ff513