Compile fix for cherry-pick

Compile fixes for crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9

BUG: 17354106

Change-Id: I3e07ab4bfd36c17ce006a73f44402251d5c83138
1 file changed