Merge "Fix unintentional fall-through in switch."
am: 451ff0d855

Change-Id: I1a462b24a9fddd57584a6d720c6e0f36932bfbad