Snap for 11051817 from 6189c59bc47946ac8742d62d0bdeef24e3b0333d to mainline-appsearch-release

Change-Id: I4e6b3abb7f7a193bf9c82fccb4d288d9c452f624