Merge changes from topics "sync_2020-01-20", "sync_2020-01-20-2"

* changes:
  Sync AppSearch from framework.
  Sync AppSearch from framework.