Merge "Remove NSD_ON setting"