Snap for 10453563 from 246d740ca4f773cbb896c83aa38ef2012e3b6fbf to mainline-appsearch-release

Change-Id: I7b177dbc83e4a54110ff6d1a6dce248a559b70f3