Merge "ATest: Grant more owner permission for atest folder."