Fix failing header test.

Change-Id: I295df02aaf6e470cac488bf0459be7aed01cfcc3
Merge topic '14614-report-numpy' into next

29a43d0a Fix failing header test.