Merge pull request #1592 from shawnguo2/fix-recovery-build

poplar: fix build error with POPLAR_RECOVERY=1