Cherry-picked commit e2ff60b0a6dbcd714d57e781d9fe174b110a6237: use rateacc values