am b7d361af: am b995c78f: (-s ours) Merge "Added SearchIndexProvider for UserSettings"

* commit 'b7d361af0f53ae36ea672491bce6c04a6c45aeda':
  Added SearchIndexProvider for UserSettings