[coastguard skipped] Merge sparse cherrypicks from sparse-10494437-L64900000961970204 into udc-d1-release.

COASTGUARD_SKIP: I655a1a8fb3ce319b60697ecac65012e9b5f41485
COASTGUARD_SKIP: I106de21ec0bb4094542aefc7b7109ab4dd9f304c

Change-Id: Id9ed44218b8ec3ec832653a88a33e73b200ce722