Merge "Update SDNC CSIT for Honolulu changes"