Merge "Suppress implicit-fallthrough warnings." am: 16fef65f9e
am: 3784224654

Change-Id: I42f2e5fcbc5308b3bb2b688bfeda11a496158d4f