Merge "Revert "Add logs for analysing b/297000797"" into main