Merge "Add additional logging for b/227115380" into tm-qpr-dev