PRSDK-3513 Addressed build errors