Merge "Add API constants for metadata for mainline modules" into sc-dev