tree 4978f7f5474cf25c25e1d428885cb15e1a527eec
parent 6c9348dc46f58c28461d1921da5f067a22afa766
author Clément Béra <clementbera@google.com> 1631794975 +0000
committer Clément Béra <clementbera@google.com> 1631795001 +0000

Fix Merge issues with Record 2

fix red bots

Change-Id: I5c4f2da193b91794c399a4a9d6625c645800ab75