am 2921201d: Remove some non-const references in utils

* commit '2921201dce37ba40c55b89c0deca3c34bf64168e':
  Remove some non-const references in utils