Merge changes from topic "planz" into pi-dev

* changes:
  Tests for SubscriptionManager APIs.
  Obtain NPMS through helper method.