[coastguard skipped] Merge sparse cherrypicks from sparse-11206848-L88800030000735408 into udc-qpr1-release.

COASTGUARD_SKIP: Ic3cd5fc82cab307e5ec379adc14fa541268a581d
COASTGUARD_SKIP: I0bb0b7914c3dcb9f63682be1f8005384ed61328e
COASTGUARD_SKIP: I8da0fcaf9e1d6e9cd6d4768f3628b43a62163688

Change-Id: I3fc35d0ae6e7f765bcc79ecd15024b123964087e