Merge "Add more logging for b/64759619" into oc-mr1-dev