Vmware Agent changes

Change-Id: Ic5318020dedc6a7a40312a3770c002eace661774
Merge "Vmware Agent changes"