Connvert index option to db option when no index is found

Change-Id: Iffe25832f13641bd30b3a6dcf60f435373ac3380
Merge "Connvert index option to db option when no index is found"