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

Change-Id: I7e555eb01bb3a6c1ae5a0ebcd4dedbe7a16c65e5