Merge "prototypes: xci: Update SHAs for OSA and its roles"