PR:2209&2922 - Database Uve for disk Usage

Change-Id: I3282c585ca212b53741a0c762282043d510e715d
Merge "PR:2209&2922 - Database Uve for disk Usage"