Contains fixes for OSSA-2024-003 and related security issues. Change-Id: Ic565abbd0704d9d1ef385f1ad9301eb53e4f07cc