Merge "Fix constant name"