Merge "ASL change toList to collect(Collectors.toList()) for compatibility with Google3 which uses and older JDK version." into main