Merge "Stop using NSD_ON setting"