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

Change-Id: Ib251b274449d39dcf064535a07bcad20d49d6f6c