fix uve import error - uve not needed

Change-Id: Idcd1e4f331e1ab9891f4f555ca0b6a5602c4d2ad
Merge "fix uve import error - uve not needed" into R1.06