[coastguard skipped] Merge sparse cherrypicks from sparse-11224170-L28700030000815849 into udc-qpr1-release.

COASTGUARD_SKIP: Icba0028e5b0b47128946980e7f12af94c55943ac
COASTGUARD_SKIP: Ie36541e9b0c50d77f77802e0b67e9f99119aa7a8
COASTGUARD_SKIP: Ib0e190a52d7e4729054fd66e3e0c9ae8ef47afa4

Change-Id: I2fd7ae7dd0a046bf641d7aeb9db8fbad1d023d83