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

Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161