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

Change-Id: I28b5c95c7de9e120194456df894d41fcaee5a416