Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into qt-dev am: a61cad1c37

Change-Id: I825e6064b7fb4cacccc2c145051c064d354c82e9