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

Change-Id: I92b41a8a43258a94ab4358a5612a690f2912c0ae