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

Change-Id: Ie41c7e8b7a687e9836354d429e66b5f214a6d0b2