DO NOT MERGE: Remove incompatible trace config property.

Change-Id: I97db82b7f330ee5c02aab21b4f0db76b3e594181
1 file changed