Merge "Add integration test for capport API" am: f2853503c3 am: ad36210c2e am: 7677548d09 am: 4eb1c98ab7

Change-Id: I4b5590e4ac8a0115f2422146470bfc60e7ef39c7