Snap for 11182773 from ebaafa96e71fbccffe5fac9e3454ea31c8d765a1 to mainline-appsearch-release

Change-Id: Ieed384ead97404357cb20ca4db25e5cdbe339a55