[coastguard skipped] Merge sparse cherrypicks from sparse-13787996-L64100030014412350 into udc-platform-release.

COASTGUARD_SKIP: Ifd8b8f78b53a37c605a8e874ae228109e52e8ac9
COASTGUARD_SKIP: I91c44428dc730be4cf42b3cb9c02e8eca4440f81
COASTGUARD_SKIP: Ibe8a80d65c4dff6368352944e004c5c934430953

Change-Id: I565db92f667833849c0f49ac3c53caedfb157658