Fix compilation after upstream merge

Change-Id: Ifde1ee07d3968b16af7ccc311b0ed615931ea921