Merge "Revert "adb: Lower EP_ALLOC retry count"" am: 169590c47f
am: 935d600800

Change-Id: Id778046511d33f5eb75d533da644b54cbe49fef1