Merge "SubscriptionManager: Cache created resources" am: f91923ff9d am: 7b76848f90
am: d490da8eb8

Change-Id: Icf6f3564e45658fad984dc6aad0ab3e3eb306278