Rename index on postgres and fix nullable fields Bug: T259377 Change-Id: I97cb12e6aa25d75ea24e187174db2fe88e5ce790