Merge "Cherrypick - Add a retry mechanism to retrieve access rules again depending on the status words"