Merge "Rename EntropyService to EntropyMixer"