Merge "Fix implicit fallthrough warnings." am: 50c5673394
am: eccb7a7e88

Change-Id: Ica7344d24dd8b847dc936d1973ccbf4ff5a5185f