Merge changes from topic 'usb_bugfix' into nyc-mr2-dev am: 55772c73c0
am: 473e3953f5

Change-Id: I333ec4ca60afdd44d0d859eb654d121f6dee95da