Snap for 10453563 from 0146411f7d7d31c4dc8321fd2626f8a7fb905f25 to mainline-appsearch-release

Change-Id: I617844dbad8910d68e057074acf31bb5cd271221