Merge "Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'." am: 495e1a8cf4 am: 54e55acf5e
am: d373668208  -s ours

Change-Id: I2f41c5e1a4865985078d5127e9d03ec36458e5c5