Merge "Fix implicit-fallthrough warnings." am: 1ea726b6d7 am: 48a2ebbe1f
am: c50a18ad8f

Change-Id: Ia6a2f378dca41b8d9f5a1f992e826269849e628c