Bug 977077 -[Cost Control] New module Sim Manager
Merge pull request #16665 from gitmai/bug-977077-module-sim-manager

Bug 977077 -[Cost Control] New module Sim Manager
r=salva