reorg: fix ntp_server settings

Change-Id: I841dba12b929d321bedffff6ec6c4deffce3c8e6