Merge changes from topic 'usb_bugfixes-mirror-aosp-master' am: b37d826204 am: 1faf15d422
am: 12488ed15f

Change-Id: I83b0e723f86791eaa5d5fbc7d21172a69bb8090b