Snap for 10453563 from 51d04dd9d10e9a57a87e07866e20c382c9958a32 to mainline-appsearch-release

Change-Id: Ic81a0aabefa249c0719693bd4f310b284669c8c1