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

Change-Id: I062b86c3c03dc2f280cec0e7bb95618213e38f6f