Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 am: 1faf15d422 am: 12488ed15f
am: 5ca0000141
Change-Id: I30febc710c88d6ca02b839f5d2afc41d2f70a9b3
This commit is contained in: