Snap for 10453563 from 451fae5251f62591d3ae12603e36334a986cbc64 to mainline-appsearch-release

Change-Id: I17a2720d75525bd349b5fc8f84b26c504d8df879