Merge "Raise MTP max burst values." am: b95db7560e
am: 840e2dcbae

Change-Id: I9105677db300d5d4782aa322ffc7c3f0f0230e69