Add the same indexes used for user_properties

Change-Id: I08c33e0a55444e6ffe352b0d6c117e2536db6a25