Make trace macros slightly more robust

Change-Id: I9544eb7b27fc1a971cabadd8d5b4b4b80678febf
1 file changed