Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 2ffbce4ef6 am: ee56d71633

Change-Id: I6097b5b69c36280151abd0b4a6cfb00a11dbf907