only re-apply RPS on change

Change-Id: I974c59109abb52b36ba0918a8fa47af4355a4349