Merge \\"docs: fixed broken link in UsbManager javadocs\\" into nyc-dev am: 162a6fad72
am: 3e15a43732

Change-Id: If7fc45f90c5777fbe2f167f04a65086f570583b8