Snap for 11698527 from 6f3861dac673dcbf9551219322e7e3ea2ec36f4a to mainline-appsearch-release

Change-Id: I02280a5ec5faa513ef40eba89b26cdbda2a02c2b