Merge "Fix implicit fallthrough warnings." am: 50c5673394 am: eccb7a7e88
am: 1e02ed8275

Change-Id: Ic2187116d0a070a765887c7b718462acb9e75bfe