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

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