Snap for 10453563 from 6f3875a7c631777c3ce629036716cadaf42c3116 to mainline-appsearch-release

Change-Id: Ifc5be084a76ab47d168bf6165f8c84086e69658a