Snap for 11051817 from 0a6fc67f5269cb3153a78998a97563266c03c4d2 to mainline-appsearch-release

Change-Id: I040fb684fca693684e4052835bf022741901415e