xua_rkm: Adapt RKM code to support IPSPRelated: OS#6474Change-Id: I9c59d6fb43d4e7ceda552f156dd7761173545b11