Merge "Fix fallthrough warning" am: e1813e522f am: 937e4af019
am: 19370ab6b1

Change-Id: Ia4e1ddc741aa25f25bbbd18a425e7df64f56ba96