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

Change-Id: I9e4ebb0e6746806a466544261def371eff4c8e21