Merge "Fix typo in MemtagHelper" into udc-dev