Merge changes Ic5a3e169,I76daa3ab

* changes:
  Refactor applyUnderlyingCapabilities and its test.
  Move applyUnderlyingCapabilities to ConnectivityService.
tree: 2c0a087ba24fa34024911789e4f8f4f8e21aacc4
  1. core/
  2. services/
  3. tests/