am d5d04be0: am fa412127: am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""

* commit 'd5d04be07fd89af8ee6e6fd1d9bd262b9eadc71b':
  Revert "Make sure that names of all entries have the same encoding."