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

Change-Id: I796340f3dd69d21ad05ba407305cbe56f8ec4266