Update USB support for 10.2

Change-Id: Ia476759fe3b996682e617844571de782eadbdb74