Merge "adb: Lower EP_ALLOC retry count" am: 7cd8349198 am: fa09be5726 am: cfd7e8b211
am: dc55ea4875

Change-Id: Ib58652650a26a1ade1e66de5d689a3b6cba80d6b