Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 2e64ca57b8

Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc
tree: c32e9332d50d055bd79a3673ac8a71894e553059
  1. core/
  2. services/
  3. tests/