[coastguard skipped] Merge sparse cherrypicks from sparse-10849031-L51600000963187231 into udc-qpr1-release.
COASTGUARD_SKIP: I732bd6a719df95de1fd8b6e28c8258aede2a6541 COASTGUARD_SKIP: I75060fc3d1989522f58cae593b1c1f4063dbd6e5 Change-Id: I992b20305db354bba1c6989e981c58db21f75d1f
This commit is contained in: