Merge "Adding multiple provider support in AbstractMasterSystemService" into tm-dev