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

Change-Id: If19edd7ff9db9d1a4bffbb4caf6c9068f916d37c
(cherry picked from commit d294930d82f93d6362752648433ace26b6c8fcb5)