Snap for 10453563 from e5d2ecaa0bd04957572af495193faaf35d8360ad to mainline-appsearch-release Change-Id: I47a7fdc6d628a36dc92f6dbe99e40ec02c56a4d0