Merge pull request #1820 from TousakaRin/helei_update_header_guard_for_periodic_task