Merge "Fix accidental implicit fallthroughs" am: 5a651961b0 am: 85a465e3f9
am: 84a156a9ec

Change-Id: I27b574ddfca4b4d21b6d40b6dba64dd3b1265f96