[FIX] Only log the rawdata once

Change-Id: I913e24078a0cdd42f6a1648c23060ea7d807bfe1
Merge "[FIX] Only log the rawdata once"