Merge "Fix implicit-fallthrough warnings." am: c1ddd1b231 am: 463aedbc1e
am: c688c0f98f

Change-Id: I11b8cfabd0ffe1ede46967865639a4056dfbe156