Merge "Add a unittest to cover the retry of load escrow data"