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

Change-Id: I29fab7adc623a8d18e8e8ac5524d78376690e290