Merge changes I3826b9ef,I91d68ca3

* changes:
  Add static for constant
  Get NetworkCapabilities from NetworkCallback