Snap for 10453563 from 7e3c0a894f738ce95a88a71128bd9d9ecdc03456 to mainline-appsearch-release

Change-Id: Ia10192755edd72683de50da56cf161ae034e4114