Snap for 11051817 from c3e289a82622aefa0cfe2c78fb39fe9636983648 to mainline-appsearch-release Change-Id: Ie63f6188ec07ed054b6d87a00929e2e003fb4edc