Merge "Suppress implicit-fallthrough warnings." am: c7e86caf44 am: d896cab7d0
am: a56cc065c1

Change-Id: I326dcd649dc9e08d26e744baeb04d00576d41574