Merge "cts: Add Khaje target to whitelist in the CTS test case"