Merge "Add CTS for new APIs"