Merge "adb: Lower EP_ALLOC retry count" am: 49c2edf553
am: eaaedd42e2

Change-Id: I51cd83b3cf1de65e8626c3d2a5da9a1d23813ae8