Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'."
am: 495e1a8cf4

Change-Id: I116e72bd0ef84e9309466651fe8f351b02487777