Merge "AbstractMap.keySet and .values should not be volatile"