Merge "Fix print-logs" into mainline-prod