[coastguard skipped] Merge sparse cherrypicks from sparse-14491201-L17700030063614037 into udc-platform-release.

COASTGUARD_SKIP: If59833f2d5060f5f81395d602e2dcb369a10fdbb
COASTGUARD_SKIP: I34167186be88db3d41a2063eea17106e09a492f9
COASTGUARD_SKIP: I7ed75c7a11e9ca30b2dd1287953b2f0e426c3415

Change-Id: I16f35058da0178130fb78edf7b161179c60e4134