Merge changes I6260695b,I88f00ca4

* changes:
  Expose clearCapabilities for mainline module
  Expose NetworkSpecifier methods as SystemApi