Merge "Clear identity before calling deeper into USB code"