[Spa] Fix build warnings

Bug: 332487783
Test: unit test
Change-Id: I835001e57f710d0369083218736d89ac219d5426
5 files changed