Merge "Rename ABI for RDNS-on-cache"