am f96c7bd4: Merge "Libutils: Comment out unused constants"

* commit 'f96c7bd4b0c9c6e5770cda034b696212c9c6336d':
  Libutils: Comment out unused constants