Merge "Fix fallthrough warning"
am: e1813e522f

Change-Id: Ic84d23cd131ecf475dee101a6fc2e0d83424c9ed