Store identifiers in DB in EC2 form instead of numeric form

Change-Id: I52587fa9e1a2f9cd31349b070dfef0ea6cce33dd