Fix for the build errors

Change-Id: I9afb7a1337ec915165bd6eb14c2d6e28ee56d54a