Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 9deb286ecb am: a6779dc9b7

Change-Id: I3fa3f96b4a06e5a2d238873ffc105ef1c7bd10a9