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

Change-Id: If5c42e9bd0b570531f29fc8ef9fc0fa1228db5fa