Merge "Fix incorrect static const"