Merge "Fix implicit-fallthrough warnings." am: 81c202f1e7 am: 4b66bd3b53
am: 77d99fceaa

Change-Id: I24e43cf8504c756fb1841d72381cd70dcb2380e8