Merge "Allow access to trace_data_file from untrusted_app context"