Snap for 10453563 from 08ec94a928ff5b291faed3a29f274441032d6761 to mainline-appsearch-release Change-Id: I192c0d67cf32d83e6bf721057d0a7a9dcf12b2a7