Merge "Fix implicit-fallthrough warnings." am: ad9708f570 am: dc607bc28e
am: 5a77ac200b

Change-Id: I663cb317bef106d9d3e09f8bf305783c41b2bf39