Fix header test warning

Change-Id: I4b406381455eb0188de1ffe43c4036eb44522865
Merge topic 'minor_fix' into master

b6d4561a Fix header test warning