Merge "Fix implicit fallthrough warnings."
am: fe9d6ef9f3

Change-Id: Ib7f6babfe80bcfe22881f5a6879304f16b44ba6a