Snap for 10453563 from c6cbacee7e128674e7e2ed0ed83589bf3ef5e1e9 to mainline-appsearch-release Change-Id: I9eed0e83662f043478fb68c7e2ea95c4193fbd25