Remove verbose headers

Change-Id: I58c060ce436afe827b43fa193b0ed9c2708b4075
Merge "Remove verbose headers"