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

* commit '64f269404bbba347e72d4a114bfcdeaa11983d78':
  [optimizing] Address x86_64 RIP patch comments