Merge "Add flags for allowlisting types for new NSD impl"