Resolve missing XML tag introduced in error during cherry pick 2032b95000f131d06245adb3b02419d04032d4df