Merge "Fix implicit fallthrough warning." am: 0f455238b1 am: b1d94eca22
am: 42bd82919b

Change-Id: I58ba1a242c7b64026dd5594ab182b62a32a56508