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

Change-Id: Id1a4e311d7732ce302440f67c93669a4ba7f16d0