Snap for 10453563 from bdecd4ef6264998d9ebf8c7aaabbf05f0438c28e to mainline-appsearch-release

Change-Id: I1263407feefe3a724e8e86cbbaa7655c749635ca