Merge changes from topic "am-d1b8befb73e94ebab249c6d74a4f4aa5"

* changes:
  [automerger skipped] Merge changes from topics "subscriptionInfo_builder", "subscription_manager_service" am: 20f007c3 am: f3db9c87 am: ebc95977 -s ours am: fbdd48cc -s ours am: 9da494c8 -s ours
  [automerger skipped] Added empty subscription manager service am: 36f55c44 am: e64ef5a1 am: a76b2948 -s ours am: 8d10fd30 -s ours am: 662cc37e -s ours