Merge "Possible fix and additional logging for b/337742708" into main