Snap for 11051817 from fa1fbc22ff354095dc0c55fbce06c1a38339cb46 to mainline-appsearch-release Change-Id: I2dbf4e01b998c689f4de178df7b39bf130d4d04b