Merge "More debug for 9404689."