Merge "update AAF certs for SDNC"