[coastguard skipped] Merge sparse cherrypicks from sparse-10872557-L44500030000834913 into mainline-networking-release. COASTGUARD_SKIP: Ia891d545dd5b10f1c8c985dc6fb14d38e4caecd7 Change-Id: I691d89e73af564670dd6acc06d989e77af62c325