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

Change-Id: I00ab9ec389091e0616aa313825a8d3f0d7963eff