Snap for 10453563 from 015bb821e8c49b6c0cbc59437f47735eb17aabdd to mainline-appsearch-release

Change-Id: Ic8a312472f49fc114941b77b8e8584e37e1564e6