Merge "Add CTS test for the capport API"