tree 062f60a868142c9c557e13117109ab84f1b9c3d4
parent be38a7dbf716cfbdc836dee06f685d69f57cdd11
author fayang <fayang@google.com> 1592934552 -0700
committer Copybara-Service <copybara-worker@google.com> 1592934585 -0700

Fixes to make chromium merge happy. No functional change.

PiperOrigin-RevId: 317898035
Change-Id: I3027b0fb20f85843babaaff4a841ca7eee70bfac