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

Change-Id: Ib0051ca4bf36f88cac7ab15741c0a7e8bc53c005
tree: d141adcc3a0473d60ecdc2cb4b4214a6d297c5e8
  1. core/
  2. services/
  3. tests/