Merge "Add return type javadoc to NetworkStateSnapshot#getLegacyType" into sc-dev