[coastguard skipped] Merge sparse cherrypicks from sparse-11181355-L89000030001348994 into mainline-wifi-release.

COASTGUARD_SKIP: I2264bf2efe42572af79f5bf6f5749d1493ba0c0f

Change-Id: I10479f4a8732524bb283f5a72998328ae2fb7713