Snap for 10453563 from da12f3a1bdbfde2efa5f792640e3ba55d813eca6 to mainline-appsearch-release

Change-Id: I6db4c32686d563dfbca3008acd0ccdd066a7ca93