Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev