[coastguard skipped] Merge sparse cherrypicks from sparse-10903244-L58600030000834910 into mainline-wifi-release.

COASTGUARD_SKIP: Id52448c6bfddc8fc7e605657bca839403e5d4380

Change-Id: I4206702626a8e449359c28fdf469a7c6e23271f5