Merge "Fix implicit fallthrough warnings." am: fe9d6ef9f3
am: 0085e651da

Change-Id: Icbb9c918c838cbf2740ef4a6e9362644dea443dd