PR:1353120 - change to database uve fields Closes-Bug: #1353120

Change-Id: I8f1d8417ffe08b1c041631c5906ec9b6f7c25fed
(cherry picked from commit 86b569c2d8a6cefbbebef600bd82920bcf3058db)