Merge "Use SubscriptionId instead of SubId" am: 946410eef5 am: 9cad054e02
am: fb0acf3355

Change-Id: I81365ed8a767f4571a62da0ff0ba170badcce462