Removed variable to allow compilation ?

Change-Id: I704bcb78dd082a0e1f9fd6e41d9aff9bbcbae553
Added flag to allow compilation

Change-Id: I183e771dc8c54ff5541238487e256c06ba3c0172