Merge "Fix implicit-fallthrough warnings."
am: 1ea726b6d7

Change-Id: I8c7c8605b70e74374ae010b2c7e46197641b1800