am b97fded2: am 2733c142: (-s ours) am 2416b832: am 15c6de75: Merge "Start iterating USB pipe endpoints from 1."

* commit 'b97fded2121b45c87c09167a304a6bf6ba03ec46':