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

Change-Id: I3847f9f6263f9e80e0e78dd7c30b8dec2f396456