Bug 993949 -[Cost Control] Follow up to add unit test for bug 986358
Merge pull request #18167 from gitmai/bug-993949-CC-adding-test

Bug 993949 -[Cost Control] Follow up to add unit test for bug 986358
r=salva