Merge "[MS29] Remove Trace hidden API dependencies"