Snap for 10453563 from 12f68c351f6540352b8bbe53b468172980d31828 to mainline-appsearch-release

Change-Id: I6311590fa9555d7e30ba86d957f1e8faeeab58f5