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

Change-Id: I395a7229e5ba157c6472fdf718a9aef4743c351e