Fixing Test builds

Change-Id: I8524ebc124270feb2e6e69e17ba0e0c6301bce18
1 file changed