clean up RR JAVA.

Change-Id: I450f6cb9daaa7b9efcae3962867c5c3233794591