Snap for 11051817 from d7aa788fdcc8aca3371553385fd318f030fbaae6 to mainline-appsearch-release

Change-Id: Ibd0a9e77e370919d671f78c4bd28bef55f8ee915