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

Change-Id: If770254a60f35dcf1ef0d1df1aa99e324ec01428