Change from_db_model to create the correct uri

Change-Id: Idbf61639854029b6d5003f58baaae171c0b3a817
Closes-Bug: #1285017
Merge "Change from_db_model to create the correct uri"