Snap for 10453563 from 30b91e939ec91c180a038e9b8b360fd82e00ab7e to mainline-appsearch-release

Change-Id: I869e20460c7a39e727ca91504e7e66f6badb8792