Merge "Use SubscriptionId instead of SubId"
am: da0eb19f50

Change-Id: I089dd5db7281faaa2af5362ab4a94b5c05ffa367