Use SubscriptionId instead of SubId
am: 6c345f3643

Change-Id: I9fc216b279f0e8aba80fb89e4e15206404fb9643