Fix query for creating custom LSI

Change-Id: Ic5d490c4af4c0bcdebc78693ac94d1688a03740b
Closes-bug: #1405622
Merge "Fix query for creating custom LSI"