Merge "Fix include of owners that was pointing to itself, and not loading the expected owners that were desired in ag/13414459" into sc-dev