Merge "Temporary additional logging for debugging b/182326102." into sc-dev