Merge "Clean up the 538-checker-embed-constants test"