Don't forget to generate RPN tokens here.

Change-Id: I03a0e0d9f82e9c8881b0ff225ba0b476a693afb1