Merge "Move addTrackingCategory from Parser to ParserOutput"