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

Change-Id: I69478885b31789008b411c5ec3a06d820efcca3f