Merge "Fix implicit-fallthrough warnings." am: 8f520e6f83
am: a6c90c99cd

Change-Id: I5efd04bf9dae335e03181b6443a3a85e69c1c042