[coastguard skipped] Merge sparse cherrypicks from sparse-9099980-L74600000957421145 into mainline-appsearch-release.

Change-Id: Id05c9073ca717f77e01bce5e2c2dfe8f77174b0d