Snap for 10453563 from 91e8e58e61a17b4b59bf5fb19806d5090cf352dd to mainline-appsearch-release Change-Id: I7d048313c3a5b1171ff9e8e1dec04ebbf27f42e8