Correcting merge build errors
Signed-off-by: Siddharth Vinothkumar <siddharth.vinothkumar@citrix.com>