fix for upsert using load with indexes LP 1364575.

Change-Id: I6b01e9dd9cfbf274ffafc8ddea5a1066027c6372
Merge "fix for upsert using load with indexes LP 1364575."