UploadStash us_props fix for Postgres

* Follows up c7f4586fe1e405e5ad8e4e504b024248a36eef57

Change-Id: I5a8568efaf0817ca743de722d5486457ff1a8d87
Merge "UploadStash us_props fix for Postgres"