Merge "Fix NPE in calling getSubscriptionPlans method." into oc-mr1-dev