am 82412e38: am f07179fe: am aa76c462: Merge "Give enum types CamelCase names for clarity."

* commit '82412e38755364fb22ed27df5c871015155ec040':
  Give enum types CamelCase names for clarity.