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

Change-Id: Idd0b0186cd948164e63623ea508f8c15235e3b2d