Snap for 11051817 from 5d5d926c5fc9a5314a49b1d5be7a4764b8eefeeb to mainline-appsearch-release Change-Id: Iafe4e6fbc6545821aa275a047622b862c153ed86