Merge "SecureRandom should be thread safe"