am ae18667f: (-s ours) am d804c6cd: am 571c8d71: Merge "Increase size of the the adb packets sent over the wire"

* commit 'ae18667f9423dcd92c0d2f00e8496b4d2d370167':