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

Change-Id: Ib0051ca4bf36f88cac7ab15741c0a7e8bc53c005