[coastguard skipped] Merge sparse cherrypicks from sparse-14342243-L35900030033906680 into udc-platform-release. COASTGUARD_SKIP: I9f651c7f1c5674df5774f5a7609f6d3749b5c50c COASTGUARD_SKIP: I42ba924539d36123572c1595655cf423901c00e8 Change-Id: Iba546ea35e314bc90d077c2c31cbf7f88d08e4af