am bf300e1e: Merge "Correction to TRACE format strings"

* commit 'bf300e1e04726528bf2fefac89e5e73aaff1d68e':
  Correction to TRACE format strings