Merge "Revert "Change links to Streams packages to {@code}."" into nyc-dev