Snap for 10453563 from cba8136dd44645ce3a97e607f9f2f3fb1c27f828 to mainline-appsearch-release

Change-Id: Ie767fc1c1d23422e5b0905588f0a11d84e890a11