Merge "Add integration test for capport API" am: f2853503c3

Change-Id: I9e4ebb0e6746806a466544261def371eff4c8e21
tree: 0dd78793e97c12a3ed9f3c19b4c44b0debaf6931
  1. core/
  2. services/
  3. tests/