Fix ml2 stack trace when logging.

Change-Id: I8bbf6edd3e526483e7f04e3eeeea571a660235fa
Merge "Fix ml2 stack trace when logging."