Merge "[optimizing] Address x86_64 RIP patch comments"