Snap for 10453563 from 5eae8ebb3c5756e41e77a1f7201fcf94b0eade1f to mainline-appsearch-release

Change-Id: I8ad0bd810e18e917a1fc56362c579112f982d555