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

Change-Id: I3ffa4bc01a0b9c17ac587ec6caa49e361a8b2777