Fix to get Viper to Build.

Change-Id: Ifc3c90c86bd7772cf6f36fa81a775c642e7b6281