Merge "Fix implicit fallthrough warnings." am: 012692be3f
am: 3515bf0fc9

Change-Id: Ia07a0a00d1ae547bc7af968e6f8a7caeb51f3e6e