Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oc-dev am: 9deb286e am: a6779dc9 Change-Id: I3fa3f96b4a06e5a2d238873ffc105ef1c7bd10a9
mentioned in commit 01975468
mentioned in commit 862f3ac7
mentioned in commit 455ed2f3