Merge pull request #77 from comius:fix-bcr-failures

PiperOrigin-RevId: 487760577
Change-Id: I6d0c275f2a899915b74f24fea6e0005874ae6a1c