Snap for 10453563 from 3c062c519750095a0dc61dcf036f15d55610917e to mainline-appsearch-release

Change-Id: I57a1c33936fec42db62367ae039b3db9ebc49fc5