Merge sc-v2-search-dev

Bug: 202967661
Change-Id: I32b8e4cdeabca1d1a9521bcafff5005a007c8acd