Merge "Expose SubscriptionPlan API." into oc-mr1-dev
am: 84c6684bba

Change-Id: I9e05d8ae075c698bc4c19132df92ea8f3f3fc52b