Merge "Revert "Add cts to test unwanted capabilities api"" into pi-dev