Merge "Prevent accessing companion records from arbitrary uids" into pie-gsi