Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: 4c13a10afc
am: efc12de111

Change-Id: I5cac966d18f3fb3c0cfcdb6e73b2c8d20cc9801b