Fix build

Cherry-pick directly to master to go around a CL that is blocking the merge queue.

Change-Id: I88e33667467c819dfc1f36d2f723706ff42cba26
(cherry picked from commit 61a60ad2e6944a80944898e636c2e9d9fd7b0e70)
1 file changed