Bug 968087 -[Cost Control] Refactor and simplify Cost Control start-up process
Merge pull request #18665 from gitmai/bug-968087-simplify-startup

Bug 968087 -[Cost Control] Refactor and simplify Cost Control start-up p...
r=salva