[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 2ffbce4ef6 am: ee56d71633 am: d6d7f518cc -s ours am: 55fa3101de -s ours am: 7eb69864a3 am: 295b8778c8 -s ours am: a971ec414e
Change-Id: Ibb9c3c060539c3a8c540b23029cd10df986757f3
This commit is contained in: