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

Change-Id: If515aaae33b31b6247936c6f0a902d775b8fa2a6