Merge "Fix implicit-fallthrough warnings."
am: 81c202f1e7

Change-Id: Iaa009a35b5d79389f8dfb2ed99b31f3386f96546