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

* commit '1b37794b07212ef32c2930937445f9cad212ac63':
  Fix 'r' for LP64.