Snap for 10453563 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-appsearch-release Change-Id: I00c7ba59353a643582a5b5c2d6dd9200200533cf