Snap for 10453563 from 3548fae93da01b9b99ff0a98bcad42df62aee1f0 to mainline-appsearch-release

Change-Id: I547477a2811058b5a06bb540ef9600e3cc569402