[coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L61400000962657635 into udc-release.
COASTGUARD_SKIP: If7a33186dcacfafc7f41b737f2fa25f84fd846fd Change-Id: Ie67b1101411451115f92a1cfae2b9145946a3ed1
This commit is contained in:
COASTGUARD_SKIP: If7a33186dcacfafc7f41b737f2fa25f84fd846fd Change-Id: Ie67b1101411451115f92a1cfae2b9145946a3ed1