Merge changes I30208257,Ie6ddfa4b into main

* changes:
  Add tests for rate limiter persist file states
  Update handling of rate limiter data load failure