Snap for 10453563 from 86b1768168c91239ef11b922794fee20192cf9d9 to mainline-appsearch-release

Change-Id: I9d6ee1b2fc1920f4e04929f4add006ef5f16ca91