Merge "Remove two TODOs from HotpulgDetectionAction."