Fix references to resources for Spa

Bug: 293810334
Test: m Settings
Change-Id: Id9e7ad5bb4dc2731545c35696ecaa842d4281323
14 files changed