Merge changes Ia99a4cf4,Ib31e23b8

* changes:
  [Testcase] To migration DisabledSubscriptionControllerTest
  Use SubscriptionManager.getResourcesForSubId to get Resources