Snap for 10453563 from 00016a46eeda9398c074603ee4ae69dcda31572d to mainline-appsearch-release

Change-Id: I1c239eea06348351cd41ab0ada323ff11293edb5