Merge "API council requested tweaks to SubscriptionPlan." into pi-dev
am: 5e0d360411

Change-Id: I447d4041d1dd0751147d13792b07d6617b27978a