Merge "Use SubscriptionId instead of SubId" am: da0eb19f50
am: cb9b60e3e1

Change-Id: I12cd90f6549bf2b0bce57a45d2de818524c646a4