Merge "Update guava version to 23.6.1-jre"