[coastguard skipped] Merge sparse cherrypicks from sparse-10843127-L40700000963720032 into udc-d1-release.

COASTGUARD_SKIP: Ie6b9fc94752d91e77e8fc48979216917c1fd9ec3
COASTGUARD_SKIP: I710e2c34228ef47c77dce25ebb3bc824c4e7d0a1

Change-Id: I13429a0d2eebe3dcba9313278b6560f3b8ef39fd