[HFX Fox] CA-127973

This is to backport Ravi's fix on CA-122467 (pull req #1579 for trunk) for the same issue on clearwater-sp1-lcm.