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

Change-Id: I94bac13072ed70dc4aae5d2ee367d07dbbb198d9