Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
am: b37d826204

Change-Id: Id5e28b59858b16c1cfde16104feb54f2a101e366