Merge "Fix implicit fall through switch cases." am: b649d39bd7
am: a7439cf826

Change-Id: I06ce78f3f7dcc61b99f5aae88afa3b111105f72f