reduce db1040 load while adding indexes

Change-Id: Ife1cfe56126532481a3fd907b11ea8e6788c607a