Merge "Make master clear constants system APIs."