Use SubscriptionId instead of SubId am: 6c345f3643
am: d5b7db316f

Change-Id: Ic2e68f6fc8f37c5f51fca9d2002ea5b91fa4d4ae