[coastguard skipped] Merge sparse cherrypicks from sparse-11186524-L15300030001008443 into mainline-networking-release.

COASTGUARD_SKIP: Ib55943ac88cb67b5fb76b80bc2d8ef3b4c6e63e9
COASTGUARD_SKIP: I63a5f7ca31199c0b37beed7945f2c66744c2db07
COASTGUARD_SKIP: Idce90091457baaf4fd6b808323c5dc8e93b77462
COASTGUARD_SKIP: I399117d553f0a7ab7a633a6d4cec83a696bb261e
COASTGUARD_SKIP: I7d8b9569964fb241cf32237f2b20d78ce8087d41
COASTGUARD_SKIP: I8cefd3d6e8cd6dd75ef4785bbf280a8beb5083ad

Change-Id: I942b0f706238f411bcda2f9c320e94a2a78da34e