[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L08900000962649037 into udc-release.
COASTGUARD_SKIP: Iea16f3e7f7b10bc0a6eb05e40cfcc9788899fe98 Change-Id: Ice787c445e6212dbb894940f6e06d425716484d3
This commit is contained in:
COASTGUARD_SKIP: Iea16f3e7f7b10bc0a6eb05e40cfcc9788899fe98 Change-Id: Ice787c445e6212dbb894940f6e06d425716484d3