Snap for 10453563 from 90f8ec85746d01057064e7c670e23c1cf66e73fe to mainline-appsearch-release

Change-Id: I3ea15393821d920fa757668392dd191d2301ec41