Sync header to product (fix build error on product branch)