Merge "Enable MTE support unilaterally for Normal World" into integration