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

Change-Id: I6b92f92beaf3ed1271446a1f04a234d00543bd60