Merge "Suppress implicit fallthrough warnings." am: 1ef73503fd
am: 20051364eb

Change-Id: I35eac7dbe09e5953985529c2101b6028283ff410