[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L97000000962543233 into udc-release.
COASTGUARD_SKIP: If462ebab67b641c2ee12324c0b862545828fe652 Change-Id: I23f6dfd65e4ec518c1c1468426fc9a54c17707ee
This commit is contained in:
COASTGUARD_SKIP: If462ebab67b641c2ee12324c0b862545828fe652 Change-Id: I23f6dfd65e4ec518c1c1468426fc9a54c17707ee