Merge "Change meta-data to property in cts test"