Merge changes from topics "fix-header-checker-tests ", "fix-header-checker-tests"
am: 9bad754624

Change-Id: Id687fad64a04cfb19dd4c94a12e6aa4051bcf62c