Snap for 10453563 from e094bef721948e46bda92d041fd5e9f4d6dbeafb to mainline-appsearch-release

Change-Id: Id0c7390c35e49ffa4e73558179553282931286e7