Snap for 10453563 from 72d01e3648e16613d4fa72478afa13b2b896b69a to mainline-appsearch-release

Change-Id: Ic1ce3e00ba6387e30a31b7dc4484fc752a5eb1bd