Merge "Fix MTE support from causing unused variable warnings" into integration