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