add all those great comments from the other file

also pick up some enum renaming

Bug: 27429645
Change-Id: Id26ddea46755b43e8db298b87b3a47b69be0f728
4 files changed