[coastguard skipped] Merge sparse cherrypicks from sparse-15842090-L93800030160725191 into udc-platform-release. COASTGUARD_SKIP: If9b1ecb8dc14a9a89c2f6135813e545e9baa0e0b COASTGUARD_SKIP: I56e19b3e1a226de21e91e400124e36021357689a Change-Id: I3ef6c11e92f089988ca43639c1e6d8437260f295