Merge "Make enum values lint friendly"