Merge "Fix unintentional fall-through in switch." am: 451ff0d855 am: 0f194c44ae am: 3e90c7021a
am: 2fc42a2796

Change-Id: Icb62d58dfa23f9e5d04de603126ea4b881a716ee