Snap for 10453563 from 7a535e61b175c5a34212f9cc05613ad505963fc1 to mainline-appsearch-release Change-Id: I9773121042336db776042bae1c604563231a8ff7