am 23c6666a: (-s ours) Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE

* commit '23c6666a88294acc5a43993cd305a8700b34d03e':
  Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE