7c5168457b
also pick up some enum renaming Bug: 27429645 Change-Id: Id26ddea46755b43e8db298b87b3a47b69be0f728
also pick up some enum renaming Bug: 27429645 Change-Id: Id26ddea46755b43e8db298b87b3a47b69be0f728