Snap for 10453563 from 1647dd701f16e1ec4092476406763683dec44960 to mainline-appsearch-release

Change-Id: I87b0278da872bf12d896f91826b1b888894816b1