[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into pi-dev am: 93067a4c -s ours am: 62f23dfb Change-Id: I9e95bcf07a55daa51cfd017b505a69883bd31ed3