Add people lookup settings keys

Change-Id: I2ff9bb7684d04f4f9b640939c7db269873aa3308
Fix error error.

Change-Id: I59508c7ad5fe4f64e8df78792c91125c08591bec
Merge "Add people lookup settings keys" into kk
Merge "Fix error error." into kk