Snap for 10453563 from 0a89c53ee1b86b387da37a227153a297af131731 to mainline-appsearch-release Change-Id: I48a2a74c20c4213d17af027d98da423c919f3f9b