Snap for 10453563 from 0a702ccae60f64c78e9b39c3767ecaaf51835726 to mainline-appsearch-release

Change-Id: Ia42446db35060323a28b20e63541a096b212f39f