[coastguard skipped] Merge sparse cherrypicks from sparse-9554781-L15100000960242289 into mainline-networking-release. COASTGUARD_SKIP: I2048b0f6f601ad93036d8c2fc9e1a3e339bd1754 Change-Id: If56a1c7db25f3228353cccf6a0b58f24cf99cb54