Snap for 10453563 from b9a2fa3696b83ff0b212ce0f5b204a55c2377627 to mainline-appsearch-release

Change-Id: I77280efdf54020952607d078e736e00bfd45b316