Merge "Revert "Add temporary logging to root cause an issue."" into udc-qpr-dev