Merge "Add optional apct flags to tests to include them into device-tests.zip"