Merge "Fix license headers for cmd testcases"