Refresh the RI object before deleting it because some information could be stale

Change-Id: I0ac1799f7e06fb49daf4c69568631eebe5a9d297
Closes-Bug: 1378482
Merge "Refresh the RI object before deleting it because some information could be stale"