Snap for 10453563 from 045ccd626f38d55301d0a6c0561a5fd8eeb54ac5 to mainline-appsearch-release

Change-Id: I47e3518e08a64de86bbf3039af7e64ba69faadbb