Merge "Fix implicit fallthrough warnings."
am: 591171a659

Change-Id: I6fc2f638f3e7559a1ec2face4c8ec2dab51506be