Compile fix for cherry-pick Compile fixes for crrev.com/7a2b1cb83546418638417fc4d3c9aa6172fe02e9 BUG: 17354106 Change-Id: I49750d359f9ebdea493337d325bcae13ee82d64d