Snap for 10453563 from fe47b7a2c273caaea6c76a15abe25bd0bb501be9 to mainline-appsearch-release Change-Id: I1c734af715ca86987293598f367a8286077aa64c