Fix the build after sync with upstream

Change-Id: I8b538cc8fa14be7404774b3e62895cbc54e787e9
1 file changed