[coastguard skipped] Merge sparse cherrypicks from sparse-11264985-L53200030001049513 into udc-qpr1-release.

COASTGUARD_SKIP: Ie36541e9b0c50d77f77802e0b67e9f99119aa7a8
COASTGUARD_SKIP: Icba0028e5b0b47128946980e7f12af94c55943ac
COASTGUARD_SKIP: Icbc5e5e8c46bf1f862501cf9097b385623657da2

Change-Id: I5b54683517e931c3897839474b6dc9e6745cdf91