am 4df30d98: Merge "[optimizing] Address x86_64 RIP patch comments"

* commit '4df30d988105f988dbcdb4f28263654e9ce20687':
  [optimizing] Address x86_64 RIP patch comments