am 806d4cfb: am 521edf85: Merge "Have R classes generate their own reference rewrite logic" into lmp-dev

* commit '806d4cfb2a06a01be4a58ff25a55797d9140b917':
  Have R classes generate their own reference rewrite logic