Merge "Fix implicit fallthrough warnings." am: 49e5755115 am: a41e795de0
am: 7d2bc00261

Change-Id: Iad68c720e8daf5cae2ea0929838b925b9f85e8bb