Merge "Fix test dependencies for AppEnumerationInternalTests"