fix uve import error - uve not needed

Change-Id: Id99ca96f60f7b860cff65922129e4717d06e81ed
Merge "fix uve import error - uve not needed"