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

Change-Id: Icaf614f013c8af5eacd75f207a6cc26793759e04