Merge "Add more logging for b/64759619"