Merge "Add delay in ping connectivity test retry" into lmp-dev