Merge "Use SubscriptionId instead of SubId" am: 946410eef5
am: 9cad054e02

Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e