Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: 4c13a10afc am: efc12de111
am: 819ba52f3d  -s ours

Change-Id: I45c537f71e575ff210eedc5508156110a81f35d5