Merge "Add temporary logging to try and debug: b/202414125" into sc-v2-dev