Merge "Use SubscriptionId instead of SubId" into oc-dev
am: 8079a69eba

Change-Id: I6088d29019aa8dc872a354cbc0b63ddb87c95b00