Merge "MTP: Include size of 12 byte header in packet size for GetObject data packet"