Merge "Don't send short URB packet when sending MtpDataPacket." into nyc-mr2-dev am: e3ebcffe41
am: be9322a021

Change-Id: Id0a1b2c57731bb0f442d4cfdadff81ae91f49144