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

Change-Id: I76010d077f96f6451b61cd358b30d0d59d1049ba