Merge "Suppress implicit-fallthrough warning." am: 3f50316ea1 am: 310ff45982
am: e8c9a8bcd5

Change-Id: I4dd24fc23c48e1aae06e6620576202fdb73479b7