Merge "Decrease UsbDeviceTest large buffer size" into pi-dev
am: 66297b0e36

Change-Id: Ia3f0f8f91ceb208e372149d85627a789d5c6f336