Merge changes from topics "fix-header-checker-tests ", "fix-header-checker-tests" am: 9bad7546 am: c8f5e1bb am: 9a0e42c2 Change-Id: Idd0b0186cd948164e63623ea508f8c15235e3b2d