am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."

* commit 'f62b602f452ab9e1f97be2a61f3c26ece12506db':
  Fix 'r' for LP64.