Merge "Remove debug log " into udc-mainline-prod