Merge changes I10355143,I85adb8c3 into rvc-dev

* changes:
  Run expiration when rollback lifetime is changed. DO NOT MERGE
  Add logs for debugging