Snap for 10453563 from e37f31a346f322a3c890299f373a3ef63aa77b47 to mainline-appsearch-release

Change-Id: I84746c1b8fa93e11620bd954ec6a11ffbe23f996