Snap for 10453563 from 0f4036126fd70c072d3b7bb7fda9dc05b6d218f5 to mainline-appsearch-release

Change-Id: Icc07d87fc2cfec16aed0bf03b0c6c89eb305bb44