Merge "Fix implicit fallthrough warnings." am: 49e5755115
am: a41e795de0

Change-Id: I6a8307219cfe87f8addd9645eac91189b16018b0