Merge changes from topic "am-42e4ac76051d4eed97cf63e8409ddbdd"

* changes:
  [automerger skipped] Merge changes from topic "unused" am: 42a600e8 am: b900f1c0 am: 77190faa -s ours am: 9ea5b105 -s ours am: e3f21c03 -s ours
  [automerger skipped] Added addSubInfo support am: 5aed8aec am: 97d54377 am: abcc76c2 -s ours am: 5f9b8c87 -s ours am: f369227f -s ours
  [automerger skipped] Added subscription info conversion method am: 2877221d am: f5192d94 am: 3c62ecff -s ours am: 76f3e83a -s ours am: 84289206 -s ours
  [automerger skipped] Removed unused method am: 451130fc am: d85727a8 am: 42b94123 -s ours am: 409441b2 -s ours am: 97ec968e -s ours
  [automerger skipped] Notify subscription info changed am: 02d5c309 am: c2143aff am: f928be80 -s ours am: 6a6f6b3f -s ours am: 61cbff15 -s ours