Merge "Handle settings update case for data_set."