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

Change-Id: Iaed5fd888b2a63224502ebbe1e54688425842d57